From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 30 Jun 2010 21:12:54 +0000 (+0100)
Subject: xenpaging: Fix 32-bit build after fixed-width type changes.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11856
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8c5c89fc7c0a08464d872d73bc8912584a264ce9;p=xen.git

xenpaging: Fix 32-bit build after fixed-width type changes.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c
index 25ad5c44ee..73debc85f7 100644
--- a/tools/xenpaging/xenpaging.c
+++ b/tools/xenpaging/xenpaging.c
@@ -375,9 +375,11 @@ int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp)
     return ret;
 }
 
-int xenpaging_populate_page(xc_interface *xch, xenpaging_t *paging,
-                            unsigned long *gfn, int fd, int i)
+static int xenpaging_populate_page(
+    xc_interface *xch, xenpaging_t *paging,
+    uint64_t *gfn, int fd, int i)
 {
+    unsigned long _gfn;
     void *page;
     int ret;
 
@@ -392,8 +394,10 @@ int xenpaging_populate_page(xc_interface *xch, xenpaging_t *paging,
 
     /* Map page */
     ret = -EFAULT;
+    _gfn = *gfn;
     page = xc_map_foreign_pages(paging->xc_handle, paging->mem_event.domain_id,
-                                PROT_READ | PROT_WRITE, gfn, 1);
+                                PROT_READ | PROT_WRITE, &_gfn, 1);
+    *gfn = _gfn;
     if ( page == NULL )
     {
         ERROR("Error mapping page: page is null");
@@ -548,7 +552,7 @@ int main(int argc, char *argv[])
     
                 if ( i >= num_pages )
                 {
-                    DPRINTF("Couldn't find page %lx\n", req.gfn);
+                    DPRINTF("Couldn't find page %"PRIx64"\n", req.gfn);
                     goto out;
                 }
                 
@@ -579,7 +583,7 @@ int main(int argc, char *argv[])
             else
             {
                 DPRINTF("page already populated (domain = %d; vcpu = %d;"
-                        " gfn = %lx; paused = %"PRId64")\n",
+                        " gfn = %"PRIx64"; paused = %"PRId64")\n",
                         paging->mem_event.domain_id, req.vcpu_id,
                         req.gfn, req.flags & MEM_EVENT_FLAG_VCPU_PAUSED);